static-delta: assert on non-regular files

Now that the computed similar objects are all regular files,
get_unpacked_unlinked_content should never be called on any other
object type. Assert that this is true instead of silently succeeding.

diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c
index aafe6fbadc0a2c29f8adef017700748d470d02b2..063c4088ad93b40e55b4fbdec87adb7df198c454 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -474,11 +474,7 @@ get_unpacked_unlinked_content (OstreeRepo       *repo,
                               cancellable, error))
     goto out;
 
-  if (g_file_info_get_file_type (ret_finfo) != G_FILE_TYPE_REGULAR)
-    {
-      ret = TRUE;
-      goto out;
-    }
+  g_assert (g_file_info_get_file_type (ret_finfo) == G_FILE_TYPE_REGULAR);
   
   out = g_unix_output_stream_new (fd, FALSE);
   if (g_output_stream_splice (out, istream, G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
@@ -571,13 +567,6 @@ try_content_rollsum (OstreeRepo                       *repo,
                                       cancellable, error))
     goto out;
 
-  /* Only try to rollsum regular files obviously */ 
-  if (!(tmp_from && tmp_to))
-    {
-      ret = TRUE;
-      goto out;
-    }
-
   matches = _ostree_compute_rollsum_matches (tmp_from, tmp_to);
 
   { guint match_ratio = (matches->bufmatches*100)/matches->total;